From: Joakim Verona <joakim@verona.se>
Date: Thu, 12 Sep 2013 07:41:49 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=64a5e06b03dc129445712cfca770b886e5f1285f;p=emacs.git

merge from trunk
---

64a5e06b03dc129445712cfca770b886e5f1285f